From: joakim@verona.se <>
Date: Fri, 20 Aug 2010 20:00:00 +0000 (+0200)
Subject: merge from upstream
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6899^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=364af7fe9b16ed1c05329093b4259dd702957eed;p=emacs.git

merge from upstream
---

364af7fe9b16ed1c05329093b4259dd702957eed